fix problem with recursion
bump
Merge branch 'release/0.10.1' into develop