Merge pull request #109 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #113 from nishedcob/master

Merge pull request #109 from nishedcob/nishedcob-nyx