manually merge some awesomeness from FT0/Carrox@6a7095c203 <3
Merge branch 'master' of github.com:hbang/Carrox