Add workaround for Cython (thanks to C Blake)
Merge branch 'master' into cython-types

Conflicts:
	AUTHORS
Merge pull request #68 from neithere/cython-types

Add workaround for Cython