Fixed several bugs (see Logfile)
Fixed several bugs (see Logfile)
Merge remote-tracking branch 'origin/master'