comment out since it is not clear if this is not implemented yet or obsolete
Merge pull request #294 from git-marijus/master

comment out since it is not clear if this is not implemented yet or obsolete