Fixed conflicts.
Merge branch 'master' of https://github.com/qualitri/imageinput