some changes from develop branch
add new stuff
Merge branch 'feature/featureA' into develop

* feature/featureA:
  add new stuff
Merge pull request #1 from nljubevski/develop

Develop