Initial import of 0.3.0.1