Pull Request for Issue #3

This is a pull request for issue #3