* removed old stuff
* quick stupid fix
* removed shit
Merge remote-tracking branch 'upstream/master'