CleanUp
Fix url
Merge pull request #765 from erwinwinder/master

CleanUp and url fix