Merge pull request #274 from nishedcob/master

Merge pull request #270 from nishedcob/nishedcob-nyx