A bunch more changes
Even more changes
Merge pull request #1 from sallain/master

Merge