tweaks
Merge branch 'master' of github.com:plawtr/panickster