completed issues #13 and #14