Merge recent work with github
Merge recent work with github
Merge pull request #1 from jetty840/dnewman-merge

Dnewman merge