Merge pull request #40 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #44 from nishedcob/master

Merge pull request #40 from nishedcob/nishedcob-nyx