Fixed disabled pages Issue #34
Merge branch 'mpm1_local'