bug fixes
Merge pull request #39 from elcabong/Dev

bug fixes