Status work continued
Merge branch 'master' of https://github.com/markfinney/lara