typofixes
Merge pull request #415 from vlajos/20140812-typofixes

typofixes