several bugfix
rename
bugfixfixfixfix
Merge pull request #29 from fyruicao/bugfix

several bugfix