PR for issue #1 and #3