Merge pull request #1 from navssurtani/master

Moved from personal repo to organization repo
Merge pull request #2 from navssurtani/master

Removed stale dependency
Add original cause to the exceptions, fixes #4
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