Merge pull request #7 from kiritoxcii/dglsTesting

Tolis
Merge origin/master into dglsTesting