Fixes #181 and adds embed tag support