Merge pull request #730 by @JohnyMoSwag