Merge pull request #3 from Dzejrou/master