Merge pull request #319 from hernando/master

Compilation fix.
Fix OSX build
Merge pull request #320 from tribal-tec/master

Fix OSX build
Config file parsing of height and width window attributes.