Added user-defined window
Merge branch 'gh-pages' of https://github.com/jakerob/windows into gh-pages