Granze Merge pull request #39 from JayAndCatchFire/patch-1