Issue 19 resolved.
Issue 21 resolved.