fixed class methods doccomment
Merge branch 'feature_20140226' into develop