version 0.2
Merge branch 'master' of github.com:fabianp/pysofia

Conflicts:
	setup.py