scheme designer
Merge pull request #1634 from diegosarmentero/master

scheme designer working