Merge pull request #600 from ovatsus/master

Embedded resources support
Temporary workaround for #587