Issue 40 resolved.