Merge branch 'release-0.7'
empty check to avoid fatal error on cj to j
Version bumped from 0.7 to 0.7.1
Merge branch 'release-0.7.1'