more bug fixes
Merge pull request #37 from eduardocampano/feature/bugfixing

more bug fixes