bug fixes
Merge pull request #193 from benitoro/master

bug fixes