Added some interfaces to make it easier to integrate
Merge remote-tracking branch 'origin/master'