Almost last figure fix
Merge branch 'master' of https://github.com/cnduru/sw7