resolves issues #14 and #15