Some small corrections
Merge pull request #36 from uroborus/master

Some small corrections