update setup.py
Merge branch 'release/v0.2.1'
Update URL
Merge branch 'release/v0.3.0'

Conflicts:
	setup.py
Update keywords
Merge branch 'master' into develop