If have an update, let me know. MR or fork not bad idea too.