Merge pull request #21 from ozzyogkush/develop

Merge latest development into master