swapped parameter order for consistency
fixed parent inheritance
Merge branch 'makeover' of https://github.com/dariusf/HubTurbo into makeover