Merge branch 'ht/method'