Merge pull request #841 from Morphan1/master

Yay additions!