Merge branch 'units-config'

Resolves #46
Resolves #56