attempting fixes
Merge branch 'master' of https://github.com/mhenry/headway