merging v1.0 from assembla