Address validation too strict
Keep it simple stupid
Merge pull request #442 from remiolsen/master

Address validation too strict