Revert "Revert "Merge pull request #583 from git-marijus/master""

This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218.
another day another concept - hope this works better
Merge pull request #587 from git-marijus/master

try once more :)