bug fixes
Merge pull request #41 from benitoro/master

bug fixes