Pull Request

I want to resolve #1