todoRemoved
Merge branch 'gh-pages'
clean up method added