Development

I think is time to move all this stuff to master