Improved header. Fixes #56