Fix merge.
Merge branch 'master' of https://github.com/mshahriarinia/gatordsr