Merging Changes made to huit::master back to tfhartmann::master