closes #13 and #14