Merge pull request #98 from sidpatel13/final_refactoring

Final refactoring
pause working again
Merge pull request #99 from rootulp/master

pause working again
fixed merge conflict, ok to pull