FIxed #10: Data validation rather than type checking
Merge branch 'master' into instantiation
Post-merge build