Incorporate changes into relex_CNN branch so others can pull updated version
Incorporate changes into relex_CNN branch so others can pull updated version