Added @static annotations
improved documentation