added django support
merge