Merge pull request #34 from xeodou/master

ImageView no longer exists. problem
Merge remote-tracking branch 'upstream/master'