closes #28 and #9