fix bugs iss53
fixed the broken email
second change iss53
Merge branch 'iss53'
v0.0.8
fix task 100
fix conflict to merge master and task100