Nested defs are evil, ban them!
Bump version for release
Merge branch 'release/0.0.7' into develop