documenting code
re-using code
fix template
comments
Merge branch 'master' into feature_parse_code