Merge pull request #2 from AndriIushchuk/core-app

Core app
fixed keyword trough on through