Merge pull request #4 from ar4s/master

Merge pull request #1 from jakitofilm/master