Fixes #42 - no more  global