Some minor changes from other pull requests and some minor code clean-up

[hakimio]

I have taken a look at some pull requests from other people and made them compatible with the latest code in master branch (27/06/2017). Also, made some minor code clean-up to get rid of the warnings shown by PhpStorm static code analysis.

Let me know if I should change something before it's ready to merge.