Fix #1

Fixed Issue #1