ChronAm additions
Merge branch 'dev' of github.com:bmschmidt/Presidio into dev