Merge branch 'hotfix/better_example'
Added long description
Merge branch 'hotfix/0.4.setup.py' into develop

Conflicts:
	setup.py