some small changes
Merge pull request #27 from dvicini/master

some small changes