Fix issue #51

Cleanup