Merge pull request #529 from renevanderark/master