Merge pull request #18 from gsserge/master

Yet Another Ctrl+W