Logic

First merge from Logic to master