This is not in master
cory's commit
Merge pull request #1 from BlueVajra/corys_branch

Corys branch