History Update
Merge pull request #1 from Koocachookies/develop

Integrate changes into master branch