#85, Changes for production release.
Merge pull request #193 from Bowman74/master

#85, Changes for production release.