Improved setup
Readme update
Version 2.0.0