Merge pull request #922 from JohnyMoSwag/master