Resolved issues #28 and #29