fixing case issue 1/2
fixing case issue 2/2
Merge branch 'develop'