added canvas support
updated login2