Update setup.py

Update version after merging pull #11 and #12