Merge pull request #1 from tpokorra/master

fixes for standalone
this pull request fixes some issues with the new single application standalone.