Merge pull request #77 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #81 from nishedcob/master

Merge pull request #77 from nishedcob/nishedcob-nyx