fix #13
fix bugs
Merge pull request #14 from allenfantasy/bug#13

fix #13
Merge branch 'master' into ink