Merge branch 'develop'
keys function for nodes
keys function for links