Issue #51 - Unit test