Merge pull request #28 from ajstanley/7.x

Fixed variable name.
ordered tabs