Done, will be in my PR!