Merge pull request #48 from acmetech/master

Misc fixes/updates