Bug fixes
Merge pull request #21 from mauroa/master

Bug fixes