Release

Include's @adampalay's hotfix.