Refactoring code and Adding Unit test
Merge branch 'master' of https://github.com/jsaurabh86/FMRProject