fixed typo and doccomments
Merge branch 'feature_20140225' into develop