globals are bad
Merge branch 'fix_double_initialization' into change-master
upgraded to 0.2.3