future proof.
Merge pull request #1 from bling/master

future proof.