bug fixes
Merge branch 'master' into add_pundit