Refactor commit, added additional error handling and changed name of Main class to "Main".
Merge branch 'master' of https://github.com/scubar/RDMP