Another Pull Request, fixes #1

.