gix bug in logic
Merge branch 'new-features'