Merge pull request #19 from bostjan/master