Merge branch 'PR4' (GitHub #4)