Bumping version
Put email field first if required (closes #269)