small fixes
Merge pull request #16 from vsantola/master

small fixes