Merge branch 'issue/30' into 'master'

Issue #30: Remove ChildView references

See merge request !21
1 job for master in 42 seconds (queued for 9 seconds)