closes #94
Merge branch 'issue-94' #94