Roadmap item #1366

Roadmap item #1366
http://www.8.php-fusion.net/infusions/roadmap/view.php?item_id=1366
Merge pull request #18 from JoiNNN/master

Roadmap item #1366