kick shit
Merge branch 'master' into shithub