Merge pull request #104 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #108 from nishedcob/master

Merge pull request #104 from nishedcob/nishedcob-nyx