updated
Merge branch 'master' of https://github.com/kcampen/hustl
a few more hacks