finish up
Merge branch 'julia' into testing