Merge pull request #64 from pondering/master

Fix figure position
finish task 1
finish task 2