Merging for issue #107
Merge branch 'idanush-master' into development
Merge pull request #107 from idanush/master

Merge Paths function to avoid creating double slashes when generating source URL's
Merging from pull requests