Merge pull request #36 from lucasbodek/master

Merging #327
image uploads