reduced cyclomatic complexity
added http://
changed license to BSD 2-Clause