Merge pull request #8 from jpecht/master

definition update / datatype: 'none' addition
more companions
merged commits
- finished definitions
- fixed structure errors