Issue 9: Completed refactoring so that the work for #3 can be carried out
Merge pull request #12 from navssurtani/mj_9

Issue 9: Completed refactoring so that the work for #3 can be carried out