Header as options
Clean up
0.0.7