#58 - renamed model configuration attributes to use __double_underscore__ style
merged in upstream changes - internal model get/set implementation
Merge branch 'master' into query-builder