fixed everything so we could merge automaticly after developing in module-branch