Merge pull request #38 from gummif/master

Consistent window return types
Formatting fixes