Merge pull request #137 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #141 from nishedcob/master

Merge pull request #137 from nishedcob/nishedcob-nyx