Improve setup and configuration

Increment version