Added new things for master
Merge branch 'master' into website