Bugfix and added @xaka to copyright headers