Merge pull request #5 from uwetews/master

resolved merge conflict
Clean merge conflicts
Merge pull request #6 from aivus/patch-1

Clean merge conflicts
Merge pull request #1 from smarty-php/master

merge