bug fixed beta 0.3