Merge pull request #209 from hunner/global_default