Optimised pretty much all code, added commands.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/config.yml