Merge pull request #152 from nishedcob/nishedcob-nyx

Nishedcob nyx