Fixed Issue #2.
Merge pull request #3 from xploredev/develop

Fixed Issue #2.