Development

current development. not finally tested to merge it into the master