Dev

First attempt to merge to the master branch