Neirth Merge pull request #9 from nieklinnenbank/master