Dev

@LucaCinquini 

Made some changes to dev. I don't think any drastic was done... :-)