Issue16

Fixed issue 16