Fixed more things. Need nick's help understanding the format data needs to be in before uploading.
Merge remote-tracking branch 'upstream/master' into vb548
Merge pull request #698 from balabhv/vb548

Fixed more things. Need nick's help understanding the format data needs to be in before uploading.