Bugfixes + new Bugs found
Merge pull request #19 from Peda1996/master

Bugfixes + new Bugs found