Hopefully fixes #52, #53 and #54.

Revert f178b50e545a552774470ed0f5730aa3e4f520d9, no idea what I was thinking
about when I did that.... :S
Get ready for 2.7.0 release