Clean-up
Merge pull request #103 from Folashade/sri

Handin version