Fix stack level deep
Version v0.6.1
Merge branch 'develop'