s1539 - Fixed PEP8 errors.
Merge branch 's1539' into random_access