Merge pull request #53 from HMAZonderland/master