Sroca - merging latest changes to master branch