Minor changes
Merge branch 'master' into locus-refactor
Removing debugging statements
Merge branch 'master' into locus-refactor