Close issues #3 and #4