Merge pull request #12 from jakuzure/master