Merge pull request #7 from Po1o/master

Sync upstream and my fork