feature and bug improvements
Merge pull request #89 from bramwell2010/develop

feature and bug improvements
Merge pull request #90 from athahar/develop

Develop