Merge pull request #185 from vfr-nl/master