Merge pull request #245 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #249 from nishedcob/master

Merge pull request #245 from nishedcob/nishedcob-nyx