2.0 version

Lots of new stuff and fixes