Added new section for method definitions
Merge upstream/master