lergo-559
updating url stuff
fixing tests
Merge remote-tracking branch 'origin/lergo-559' into lergo-559
Merge pull request #187 from lergo/lergo-559

lergo-559