conversion to pep8, additional enhancements
Merge branch 'master' of https://github.com/526avijitgupta/cyberoam-rescue