Merged pull request #1 from Dan Wolfgang