Updating my fork

trying to merge latest developments in the Master branch into my fork