Merge pull request #30 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #34 from nishedcob/master

Merge pull request #30 from nishedcob/nishedcob-nyx