Merge pull request #202 from duncanspumpkin/master

Fixed small window bug and changed to using global window list var