Merge pull request #270 from nishedcob/nishedcob-nyx

Nishedcob nyx