merge master and nishedcob-nyx