First version to expose to github.

Merge branch 'local-master'