tests and read-time
Merge branch 'master' of github.com:HParker/horizon