merge with enhancements
modified readme
added todo file
merge

--HG--
branch : enhancements