Resolve #1.

Please merge this great pull request.