de-bugged code for test cases; edited for PEP8
Merge remote-tracking branch 'origin/master'