updated to ver. 0.3