closes #28 and #26