Merge pull request #10 from AnastasiaStudent/master

sds
updated with other's versions
bjorn
Merge pull request #7 from Johnmalc/master

Update