Merge pull request #22 from Basert/master

fixed bugged merging
Merge pull request #23 from Basert/master

layout fix
Fixed array php5.4 > php5.3