Issue #153 - part 2.1
- camelcase ids