#226 Canvas support

Added initial canvas support