-fixed major bug
-version++
Merge remote-tracking branch 'origin/features' into features

Conflicts:
	version