Added CommandExecutor call, fixes #3