release version
Fixed small bugs