Merge branch 'CURATOR-116' of https://github.com/cammckenzie/curator into CURATOR-116
This closes #13