Embed tag

Here you go: I rebased master on this branch and now history should be cleaner. Also I'm verbatim in code comments and code readability as you suggested.