Merge pull request #1148 from JohnyMoSwag/master