Merge pull request #235 from nishedcob/nishedcob-nyx

Nishedcob nyx