Updated logic and classes for ability to specify non-default datatype
Merge branch 'master' of github.com:CybOXProject/python-cybox