modifications for errors
Merge branch 'staging' of github.com:itdoors/sd into task_653