site class overrides fixes #35
Merge remote-tracking branch 'origin/master'