Issue 112 fixed