Fix for #57.
Merge branch 'issue-57'