Release 1.0.1

Merge release 1.0.1 back to development