closes #51