Closes #13 and #19