Merge pull request #103 from ChrisBoesch/master

Updates
Merge pull request #104 from ChrisBoesch/master

Updates
Cosmetic changes
Merge pull request #324 from ShaikDawood/master

Cosmetic changes