Merge pull request #245 from nishedcob/nishedcob-nyx

Nishedcob nyx