Fixing bug #3
Merge pull request #12 from anagno/master

Fixing bug #3