Merge pull request #1 from Cardshifter/master

Fast forward