Resolve #12 and close #12 Added sorting by header