Merge pull request #114 from bphinz/master

Fixes for issues caused by restructuring