Issue 24 resolved