still some bugs
Merge pull request #19 from frankmu/master

xxx