code style changes

Shorten function comment

Code standards - align params in docblocks

Break test into four

add line between @see and @param docs

Add second blank line between test methods

Fix formatting
Merge branch '4.2' of https://github.com/penoonan/framework into 4.2