Updated to 3.0.0

To do: add tests