some Bugfixes, some new Bugs
Merge pull request #76 from KMichalski/master

some Bugfixes, some new Bugs (FBO)