Updated version in setup
Small bug fixes for v3