Added restart shortcut
Added alias name to unknown alias error output
Merge branch 'refs/heads/develop'