Merge pull request #14 from Pacane/master

Sync fork