consistent upload after cleanup from merges
Merge pull request #66 from roger-wolf/master

consistent upload after cleanup from merges