todo added
add code from ramsy's branch
Merge branch 'master' of github.com:rawbee/lifelist-common