Merge pull request #9 from jr-news/master

Sync with master
Merge pull request #10 from jr-news/newman

Merge pull request #9 from jr-news/master