Parse stuff added. partly correct.
Merge branch 'master' of https://github.com/gtor67/coach