Updating to rajkosto master