Bump version
Refactoring
To private class
Merge branch 'vcf'