Merge pull request #152 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #156 from nishedcob/master

Merge pull request #152 from nishedcob/nishedcob-nyx