Merge pull request #8 from ncgroup4/dev

Dev
Merge pull request #9 from ncgroup4/dev

Dev
Merge pull request #10 from ncgroup4/master

Merge branch