Refactored, optimized, made version bumping more obvious
Merge remote-tracking branch 'upstream/develop' into develop