Merge pull request #240 from nishedcob/nishedcob-nyx

Nishedcob nyx