merge feedback on 'v0.2_rc' into dev