Merge pull request #167 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #171 from nishedcob/master

Merge pull request #167 from nishedcob/nishedcob-nyx