Adding upstream version 0.3.7.