Merge with main

Updated to version 1.1.0