Merge pull request #11 from jr-news/master

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

Sync with master 2