Merge pull request #17 from thierer1/dev

Finalize and clean-up code and functionality