Bae/v1.3.5

Depends on #15