Merge pull request #1 from ericbmerritt/master

Initial cleanup and reimplementation
Fix build issues when running dializer