Thiru, Kumaran & Kiran | #782 | Temporary commit for release 0.1.1