Merge pull request #51 from ashblue/feature/remove-master-overwrites

chore(git): removed code from `master` that leaked into `develop`

Author: ashblue