Merge branch 'macair'
nn
graph test