Fixed #1

Fixed Issue #1.