bug fixed. Ready for V1.1