downgrade back to 0.8.1.1 because of issues
Merge branch 'dev' into epaminond
Merge