Changed the command structure to use less commands
Merge branch 'master' of https://github.com/magnusulf/Derius.git