Merging UECIDE fork into master branch