Merge pull request #182 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #186 from nishedcob/master

Merge pull request #182 from nishedcob/nishedcob-nyx