Adds more prototypes and styles messages
Merge branch 'master' into sara-master
Merge pull request #33 from slkennedy/sara-master

Sara master