Fixed some Bugs
Merge pull request #5 from Nico205/3.5-Beta

Fixed some Bugs