Merge, closes #113