update bugs and remove the one done
Merge pull request #28 from lebtown/patch-7

update bugs and remove the one done