removing klinger from public branch
Merging public into master since they are the same thing. Merge branch 'public'