Merge pull request #206 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #211 from nishedcob/master

Merge pull request #206 from nishedcob/nishedcob-nyx