Re-commit correct branch
Merge pull request #19 from vincentdo/master

Re-commit correct branch