minor bug fixes
Merge pull request #31 from elcabong/Dev

minor bug fixes