removed a TODO
Merge remote-tracking branch 'GitHub-9741/master'
Added a few more methods