TimeOut Exception handling
adding unittests from rick
pep8 changes
Changes with respect to coding standard