Fix messing with commits
Fix messing up files
Merge pull request #161 from juhasch/fix_imagetransfer

Fix imagetransfer