Bug fixes
Merge pull request #23 from mauroa/master

Bug fixes