--ui-highlight

This PR is based on #35. Made some cleanup, added tests and updated README.