Merge pull request #199 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #203 from nishedcob/master

Merge pull request #199 from nishedcob/nishedcob-nyx