Merge pull request #138 from ivanlanin/develop

Additional unit tests
Add function to check for image type.

Some servers do not have exif_imagetype available. So I added a work around.
Added test case for image type detection

Conflicts:
	changelog.txt
Merge branch 'refs/heads/master' into develop

Conflicts:
	changelog.txt
DocBlock corrections