bug fixes, V 1.1 for production
resolve conflict after merging