Merge changes from sourceforge