Many improvements.
Merge branch 'master' of github.com:officernd/officernd