Resolved merge conflicts from pull request #11 from malaybiswas/topic
Merge branch 'malaybiswas-topic'
Re-formatted code