More 1.5 Class updates
Signed-off-by: Steven Downer <Grinch@outlook.com>
Merge pull request #192 from Grinch/1.5

More 1.5 Class updates