Merged TODO issue to README.me