merged updates from jfelder (Updating for 4.1)