tarcieri Merge pull request #14 from olivierlacan/patch-1 …