reworked embedding
fix merge conflict
Merge pull request #116 from tyscorp/master

Reworked Embedding