Version 1.0.1

Syncing with changes at master.