#808 should be finished now
Merge pull request #943 from PirataNervo/feature-808

#808 should be finished now