Fix of typo and other minor improvements
Merge pull request #88 from AdrianVasiliu/1.9

Fix of typo and other minor improvements