Tweaking
Merge branch 'master' of github.com:kennyhei/cattz