if there's a chance this might be merged, I will address this.. it's been open for a month so not sure if this pull is wanted.