Commit 3

Bug fixed #1, #2