Fixed #615
Merges #616
+ PEP 8