Merge pull request #2 from rachetfoot/master

Various