see comments
Merge pull request #1 from antonydenyer/master

see comments