bugfix
Merge pull request #19 from lovebear/bugfix

2 global variables bugfix