More todos added
Merge branch 'develop' of github.com:vinsol/freeka into develop