Issue #105 ... dammit I hope it's all now!