Merged #2 into 3.0