Migrated to django 1.5.4 and added some improvement.