Fix things based on review from Damien
Merge pull request #11 from massix/master

Fix things based on review from Damien