merging master fork into my own

testing merging the main fork into my own... lets see if it works.