Merge pull request #1 from knusbaum/master

Added window support.