Some more streamlining
@return <class> instead of @return static
Merge pull request #19 from timoschaefer/1.3

Merge branch '1.3'