Moved some static vars to class level
Merge pull request #45 from GrahamCampbell/val

Moved some static vars to class level