Merge pull request #19 from ben-roling/CRUNCH-677_master2

CRUNCH-677 Source and Target accept FileSystem