Fixed comments
Bug fixed
merge with sakas
read-write