Fixing #2
Merge pull request #11 from anagno/master

Fixing #2