closes #28 and #43