Merge pull request #5 from vincentmrose/master

Merging to my fork.