Bugs/6

please merge