V1.0

merging version 1.0 into master