@theefer See 0eb26e2, slightly different. Merging now!