Commit to master

Tests in maven were passed