V0.1.1 fix

Bring fixes to 0.1.1 version branch