Merge pull request #1 from simonl-/develop

Merge latest set of changes from develop/ into master
 - Adding in support for booleans and numbers
Merge pull request #2 from jrnt30/feature/boolean_support

Feature/boolean support