Merge pull request #1 from StefanRvO/master

Fast forward