Bugfixes blue
Bugfix wiggler, bg generation
merge with master
merge with master
Merge remote-tracking branch 'origin/wiggler'