Feature/v35 stable

fixes #10