Closes #76