Resolves #4
Merge branch 'parent-extra-space' into develop