Merge branch 'methods'