Merge pull request #76 from jpgg/dev

Merge Dev to Branch?