Merge pull request #14 from Pacane/master

Sync fork
Merge pull request #5 from spg/master

Merge pull request #14 from Pacane/master