Added new window option
Merge branch 'master' of github.com:onespacemedia/cms