fixed test
updated readme
Merge branch 'master' of github.com:melish/oshathumbnailgenerator