Merged new Version with master