Merge pull request #2 from oggnik/dev

Dev
Merge pull request #3 from oggnik/dev

Dev