bug fixes
Merge branch 'dev' into Sovanta
push to 0.2.1