Merge pull request #762 from mcmonkey4eva/master

Who needs direct commits when we have Pull Requests