removed global variables
0.2.4