Fixed issue #12

Fixed issue #12