Merge pull request #72 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #76 from nishedcob/master

Merge pull request #72 from nishedcob/nishedcob-nyx