More Awesome Sh

merge if you like, licence would be cool though :cat: