Re-implement custom headers
Bumped version