Minor additions
Merge branch 'Drizzle' of github.com:shaps80/ShapsLibrary into Drizzle