Changes from merge
Fixing img.contain
Merge branch 'master' of https://github.com/glucasroe/narcissist