bug fixes
Merge pull request #10 from elcabong/Dev

bug fixes