added public access modifiers
removed private access modifiers
Merge branch 'develop' into feature/mapping
added first attempt for attribute mapping
added attribute mapping with strict and loose mode