Implement issue #55
Merge pull request #58 from bcbarnes-gmx/Issue55

Implement Issue55