#15 compliant with PEP8
Merge branch 'issue15' into develop