Project : gondor
Issue: https://github.com/coding-blocks/gondor/issues/126
Pull Request: https://github.com/coding-blocks/gondor/pull/127