don't fold classes
Merge branch 'jondavidjohn_github.com/develop'