Changes in bugfix branch
bugfix and develop
Merge branch 'feature/bugFix' into develop