Tidied up and added new type 3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'