Tweaks from laptop.
Merge branch 'master' of github.com:zfogg/zfogg