Wrote #3, #4

First pull request in branch