Updated build system
Merge branch 'master' into Joe
Merge branch 'master' into Joe
Adding externs
Adding externs