New Source Code v1.1 (Issue #1)

Fixed issue #1