issus #3 Temp Fix (Need to Test!)
Merge pull request #5 from AngeloidTeam/issue

issus #3 Temp Fix (Need to Test!)