Took care of TODOs
Merge pull request #72 from Folashade/sri

Took care of TODOs