Bringing inline with corrected development version
Merge pull request #1 from Clicksco/assorted-updates

Bringing inline with corrected development version