minor bug fixes
Merge pull request #42 from julianbadillo/master

minor bug fixes