Group related code
Fixed minor bug in docs
Minor bug fix