Merge branch 'upstream'
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from Po1o/master

Sync upstream and my fork