etc.
Merge pull request #476 from jrogelstad/master

Etc.