Part 3
Merge pull request #29 from alimoeeny/patch-9

Part 3