Closes #52

Implemented Issue #52