Merge pull request #45 from janm399/master

CV code; preliminary checks and unit tests