Merge pull request #1 from DewaldV/master

Suggestions