Closes #64, Closes #54
Merge branch 'bugfix-#64' into enhancement-#54