#555

Request to merge #555 into the master branch.
All `draw` methods have been changed to `drawImage` now.