Apply PEP8
Merge branch 'pr/44'