Fixed issue #37

Fixed issue #37