small fixes
Merge pull request #19 from elcabong/Dev

small fixes