Merge pull request #313 from CSGOpenSource/CSG-v1.0.1