Reimport of version 0.3.0