updates to work with latest upstream
Merge pull request #52 from thomasmckay/latest

updates to work with latest upstream
wip
wip
wip