Merge branch 'master' into tests-fixes
Order methods the same as the interface
Update docblocks
Merge pull request #104 from VSEphpbb/tests-fixes

Fix up docblocks and make consistent with interfaces