New Version

Bug fixes