minor fixes
Merge pull request #93 from elcabong/Dev

minor fixes