Finished version 0.9
Updated version
Merge branch 'master' into develop
Added ToDo