Fixes #22
Merge branch 'mixed_base_case' into develop