Merge pull request #114 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #118 from nishedcob/master

Merge pull request #114 from nishedcob/nishedcob-nyx