Qa 1.0.0

merging qa 1.0.0 into master