Merge pull request #6 from winnietong/canvas

Canvas