new hustle, fixed some shit
Merge branch 'master' into sjcl