Several bugfixes
New build
Merged something