Add new feature #1234

Please review this new added feature