Part 2
Merge pull request #28 from alimoeeny/patch-8

Part 2