#1 fix for v0.2
fix #5