Updating toolkit to master