Upgrade to later six + update to 0.3.0