Final changes for 1.0.0

:beers: