closes #93
Merge branch 'issue-93' #93