Merge branch 'master'
Add 3 prototypes
Merge branch 'Dev'