Issue 61 solved