Issue #52 - added tests