Working on #436
Merge pull request #849 from ATofighi/working-436

Working #436