Fix association issue
Merge branch 'master' of git://github.com/josbeir/Image