Gb test 1.0 dev

Merging code