Merge in 1.1.1 code from Curse
Merge pull request #1 from jturel/1.1.1

Merge in 1.1.1 code from Curse