Fix Ripley's mess ...
Merge pull request #8 from snoweye/master

0.1-7