Fixing issue35 stage 1
hot fixing
modify in master
Merge branch 'issue35'