bumped version to 1.0 in preparation for branch merging