Merge pull request #532 from cnelissen/NetPackageConstantsFix

Net package constants fix

* cnelissen/NetPackageConstantsFix:
  Moved global constants to class constants