made gnu 4.6 compatible
Merge branch 'new_branch_name'