Merge branch 'master' of github.com:shell909090/schemepy

Conflicts:
	schemepy/objects.py
Merge branch 'master' into callcc