Some suggested additions
Merge pull request #1 from novalis/master

Some suggested additions