Closes #11 and #14