Merge pull request #2 from inkrement/dev

Dev
Merge pull request #3 from inkrement/master

Merge pull request #2 from inkrement/dev