Merge pull request #2 from kmchugh/dev

Merge of dev