getting stuff working for 6.0
Merge branch 'master' of https://github.com/Mirroar/TopFit