Merge pull request #52 from mikeedwards/master

better event for image loaded