closes #51 and #52