Support for additional information to be sent
Merge remote-tracking branch 'origin/master'