Refactored commands into a proper command system
Merge remote-tracking branch 'origin/master'