Add description option. Fix specs
Merge branch 'zbelzer-add_description_option'
Updated todo list.