Fixes
Merge branch 'hakydev' of github.com:triplepointfive/hakydev into hakydev