Fixsed Issue #3

Issue #3