Merge pull request #230 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #233 from nishedcob/master

Merge pull request #230 from nishedcob/nishedcob-nyx