bug fixed for production
merged files with master