Merge pull request #5 from Johnmalc/master

2.11
Merge pull request #12 from AnastasiaStudent/pr/4

Merge pull request #5 from Johnmalc/master