code transfer from the temp repo

Jira task: APPPOL-1
Merge pull request #1 from pankuleczka/master

code transfer