Merge branch '16-flake8-found-issues-after-merge-to-master' into 'master'

Resolve "Flake8 found issues after merge to master"

Closes #16

See merge request !19