Merge remote-tracking branch 'origin/issue30' into issue30