bug fixes
Merge pull request #80 from julianbadillo/master

bug fixes