Update README with roadmap update for <hr>
Move template appending into function, add test coverage
Merge remote-tracking branch 'upstream/master'