add new feature to the todolist
Merge remote-tracking branch 'hack/master'