Merge pull request #1 from andrew-codechimp/master

Merge
Merge pull request #2 from andrew-codechimp/dev

Merge pull request #1 from andrew-codechimp/master