Fixing fs#317
Merge pull request #16 from LeForgeron/master

Fixing fs#317
Merge branch 'master' into refactor