Merge pull request #119 from mpeuster/master

Added emulator specific entrypoints for containers