Merge pull request #114 from pakozm/devel

Devel
Updated references
Merge branch 'master' into ann_graph