Merge pull request #127 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #131 from nishedcob/master

Merge pull request #127 from nishedcob/nishedcob-nyx