Issue14

Fixed Issue #14.