fix
Merge branch 'issue7_6_2014'