Merge pull request #94 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #98 from nishedcob/master

Merge pull request #94 from nishedcob/nishedcob-nyx