Closed Issue #26 and updates to Issue #14