Suggested improvements
Merge pull request #1 from simon816/patch-1

Suggested improvements