Issue 28 fixed