Merge branch '4-change-output-container-to-dict' into 'develop'

Resolve "Change output container to dict"

Closes #4

See merge request !6