Added @aburgel for work on #887. Thank you :)