Fixes #69, #57
Merge pull request #72 from undp/embed-fixes

Embed fixes