Closes #34, #36