Merge pull request #4 from kmchugh/dev

Merge into master