Handle http errors
Version bump
Merge