Issue12

Fixed issue 12