Merge pull request #235 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #239 from nishedcob/master

Merge pull request #235 from nishedcob/nishedcob-nyx