v.1 changes
Changes and bug fix