Merge pull request #132 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #136 from nishedcob/master

Merge pull request #132 from nishedcob/nishedcob-nyx