Updated to support rc7
1.0 support
Merge branch '1.0'