Todo list & bonus alias

Added todo list and added an alias.
Merge branch 'master' into development