bug fixes, features
Merge pull request #91 from bramwell2010/develop

bug fixes, features
Merge pull request #92 from athahar/develop

Develop