Closes #35
Closes #37
Closes #32
Merge branch 'master' into cfg_as_object