Add changes erroneously included in version 1.0.0