Update of master branch with sourceforge commits