Less redundant code is less redundant
Merge branch 'master' of https://github.com/Gbear605/uPic_client