Closes #88.
Updated per changes in last commit