added support for original methods
Merge remote-tracking branch 'upstream/master'
Merged with upstream