Fixed
Merge pull request #221 from suskind/develop

Fixed  global var hardocoded in Common