Closes #94, cleans up some old code style
Merge branch 'issue-94' into develop