added "todo" example
comment outed trash code
Merge branch 'develop'