Merge pull request #65 from pondering/master

Add task 1,2,5
some task 7