1.6 compatible
Merge pull request #12 from TAMED/staging

1.6 compatible
Ehhh just doing it myself it's < 1 line.