Fix image link. Close #39
Resolve merge conflict