Merge pull request #263 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #267 from nishedcob/master

Merge pull request #263 from nishedcob/nishedcob-nyx