Last changes from work.
Merge branch 'master' of https://github.com/rabbbit/homeconfig