Implemented Issue56

I believe this is what you had in mind for this issue. If not, let me know.