created wrappers for retriving all primitive types, to avoid null pointers
Merge branch 'hotfix-v2.0.1'