Merge pull request #84 from blacksmithgu/dev

Merge Dev into Master