Merge pull request #1 from GiantSusus/master

Latest updates from master