big fix
Merge pull request #27 from ErikFang/master

big fix