final commit
just added a few missing docblocks, nothing exciting
Merge origin/master