Implemented issues #56
Implement issue #55
Merge pull request #57 from bcbarnes-gmx/Issue56

Implemented Issue56
Merge pull request #58 from bcbarnes-gmx/Issue55

Implement Issue55