[dev] >> [master] merge for final 1.0.3 release

Dependent on #112