Added Class constants and reformatted reflection calls a bit
Merge branch 'master' into fix