Merge pull request #6 from Johnmalc/master

Ipdated
qq
Merge pull request #10 from AnastasiaStudent/master

sds