Merge pull request #5 from Akanoa/primitives

Primitives
Merge pull request #6 from Akanoa/primitives

Primitives
Merge branch 'master' into primitives