i fix #189

Partially ready for 0.3.0 as well