Changes to framework
Merge pull request #1 from nimsothea/wcs.admin

Changes to framework