resolves issues #1 and #44