fixes
Merge branch 'hedley' of github.com:Gizra/Gizra into hedley