Merge pull request #59 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #63 from nishedcob/master

Merge pull request #59 from nishedcob/nishedcob-nyx