Closes #105, #106