Added shell_exec
Merge branch 'develop'