Bugfix
Bugfix and merge