minor changes
Merge branch 'master' of github.com:marijnkoolen/From_Object_to_Data