Closes #74
Merge branch 'issue74' into devel