global object consistency
Merge pull request #2 from kjarmicki/master

global object consistency