Merge branch '1-refactor' into 'develop'

Resolve "Refactor"

See merge request !2
2 jobs for develop in 41 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #417
docstyle

00:00:27

passed #416
pep8

00:00:41