initial commit.
Merge branch 'plutarch-dev' into origin-master