7-20 changes for MV, data upload
Merge pull request #4 from luokk/master

7-20