Updated
...
Merge with Paul's repo