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