fix #210
fix #208
fix #196
fix #192
Merge pull request #3 from astaxie/master

update