Merge pull request #19 from sodanca/newman

Merge pull request #18 from sodanca/master
Merge pull request #20 from sodanca/master

Merge pull request #19 from sodanca/newman