source optimized

source optimized
Issue #2 fixed

Issue #2 fixed