Version 1.0 merge

version 1.0 release merge