Import of version 1.0 from original project