Merge pull request #4 from aammd/master

Get changes from upstream