pulling for tomas
Merge branch 'lewis-private-place' of https://github.com/hyperatom/DigitalTrails into lewis-private-place