Bug fixing
Merge pull request #49 from mauroa/master

Bug fixing