Issue 17 resolved.