checking code with PHP 5.5
Merge pull request #20 from GMaissa/develop

checking code with PHP 5.6