Merge pull request #2 from jrogelstad/21664