Merge pull request #83 from areveal/cole

Image fix.
Fixed password bug