new stuff
Merge pull request #80 from bramwell2010/develop

new stuff
Merge pull request #81 from athahar/develop

Develop