Pull request 1 aui 1628

Hey Jon,

Not sure if this should go through you or someone else. Let me know.

Thanks.