fix bugs
Merge pull request #30 from daolm/master

fix bugs daolm