Merge pull request #507 from dsoms/master