Merge pull request #254 from nishedcob/master

Merge pull request #250 from nishedcob/nishedcob-nyx
Merge pull request #258 from nishedcob/nishedcob-nyx

Merge pull request #254 from nishedcob/master