Implementing issue 294

Please find comments about this implementation and intructions about tests on issue https://github.com/Kotti/Kotti/issues/294