Long-overdue completion of issue 99
Merge branch 'develop' of https://github.com/shirtsgroup/InterMol into develop