PEP 8
Merge branch 'develop' of github.com:rproepp/spykeviewer into develop