Merge branch 'issue/8' into issue/7