fix 20140528
fix 20140529
Merge branch 'release/v0.2'