Merge branch 'develop'

update readme and todo