Merge pull request #2 from kmchugh/dev

Merge of dev
Merge pull request #3 from kmchugh/master

Merge pull request #2 from kmchugh/dev