Corrections #258
Merge pull request #260 from feuloren/master

Corrections PR #258