Merge branch 'feature/stabilization'
Update pom version after merging feature/stabilization to master
Merge master into feature/statbilization branch