Fixed bug after merge
Merge branch 'master' into holis_test-2