Merge pull request #7 from hacklanta/kwality-control

Kwality control
Merge remote-tracking branch 'origin/master' into magical-deployments