Added #1090
Merge pull request #1180 from xerora/implement-1090

Added #1090