Pull changes from Development into Master

Command execution is now working