Merge pull request #1 from Ornedan/master

Beta Update
Refractoring Bugfixes
#Refractor Completed!