Merge pull request #147 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #151 from nishedcob/master

Merge pull request #147 from nishedcob/nishedcob-nyx