cleaned up things
Removed redundant code
Merge pull request #12 from WouterJ/patch-1

Removed redundant code
updated some repositories URLs