Merge pull request #99 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #103 from nishedcob/master

Merge pull request #99 from nishedcob/nishedcob-nyx