sorry, misunderstanding
Merge branch 'stable' into 0.2.0
merging with stable