Merge pull request #142 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #146 from nishedcob/master

Merge pull request #142 from nishedcob/nishedcob-nyx