Initial commit including dist.
Merge branch 'master' into dist