Merge Rik's changes into fillerwriter's master branch.