type changes
Conflict resoveled
Merge branch 'master' into gh-pages