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

Class file updates