1.0 develop

First update master