okok
Merge branch 'master' of https://github.com/lywaterman/pyer

Conflicts:
	c_src/.py.cpp.swp
fix