Merge pull request #1 from vikinghug/master

Upstream update
Merge pull request #2 from vikinghug/master

Development
replaced wndmanagement string with Viking
Merge pull request #15 from Crowdedlight/master

replaced wndmanagement string with Viking