#63 added diamond syntax where applicable
Merge pull request #64 from jule64/master

#63 added diamond syntax where applicable