Update my master with FCP-INDI master

Merge in new release v0.3.4