Ver. 3.5

Bug fixes