Merge pull request #19 from horacio3/dev

Baseprep and Verify cleanup