fixmes
Merge branch 'master' of github.com:cnduru/sw7