Merge branch 'master' into dnewman-merge
Add missing newline at EOF
Merge pull request #95 from jetty840/dnewman-merge

Dnewman merge